# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1239.1.4 -> 1.1239.1.5
#	   arch/ia64/Kconfig	1.38.1.4 -> 1.38.1.5
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/09/09	jbarnes@sgi.com	1.1239.1.5
# [PATCH] ia64: update Kconfig comment for NR_CPUS
# 
# --------------------------------------------
#
diff -Nru a/arch/ia64/Kconfig b/arch/ia64/Kconfig
--- a/arch/ia64/Kconfig	Fri Sep 19 00:40:18 2003
+++ b/arch/ia64/Kconfig	Fri Sep 19 00:40:18 2003
@@ -424,9 +424,15 @@
 	  support" (CONFIG_PROC_FS) is enabled, too.
 
 config NR_CPUS
-	int "Maximum number of CPUs (2-64)"
+	int "Maximum number of CPUs"
 	depends on SMP
 	default "64"
+	help
+	  You should set this to the number of CPUs in your system, but
+	  keep in mind that a kernel compiled for, e.g., 2 CPUs will boot but
+	  only use 2 CPUs on a >2 CPU system.  Setting this to a value larger
+	  than 64 will cause the use of a CPU mask array, causing a small
+	  performance hit.
 
 source "fs/Kconfig.binfmt"